Merge branch android12-platform-release Change-Id: I8188384860adfc6581d7df944f3960463d716270