Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master