Merge branch android12-platform-release

Change-Id: I308a866aa3077aeb4ce933e8b62aff225f479ed4