Merge branch android12-platform-release

Change-Id: Ibe40fc602290f6ceb736fc9cab58b5a27636c9da