Merge branch android12-platform-release

Change-Id: Ib6205cd99c26abeea301d972e589881a0daf6283