Merge branch android12-platform-release

Change-Id: I7bc47ffa7b721b47aa712826b4ecb2a6839cf7ff