Merge branch android12-platform-release

Change-Id: Ib5c1d6382b80dfc780b560d6edb1e61c05b305de