Merge branch android12-platform-release

Change-Id: I19f6f7f3adac7955f2bade4d42f21fa743c23807