Merge branch android12-platform-release

Change-Id: I28403af26c6c4edd099cf488435df61e9df46601