Merge branch android12-platform-release

Change-Id: I46c43a271e6bb8e76be4a0e484f7038742f70189