Merge branch android12-platform-release

Change-Id: I9bcb3dbc4bb11b31a075c39b6fb9c417e15017fe