Merge branch android12-platform-release

Change-Id: I72612750a59906006ea0e07ec55cf313539061df