Merge branch android12-platform-release

Change-Id: Icd979ba8dbcea583aaa7facef00fed98fca8f45d