Merge branch android12-platform-release

Change-Id: I2e0377d17917def8242764c8fdece9306ec6411e