Merge branch android12-platform-release

Change-Id: I1d4064d1dc03c1aef385129d1c5713420044bb59