Merge branch android12-platform-release

Change-Id: I2eee8760737a5ac7774f1d416bc449ab8711b1b6