Merge branch android12-platform-release

Change-Id: I20f4ba5d3de18a5afc35650e61684d92500598b2