Merge branch android12-platform-release

Change-Id: I4dbaa24b2c09cea47081d3480018996522a8c7ac