Android 12.0.0 release 4
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e3c9192408 -s ours am: f567cfaaf2 am: 6b5afd874d am: 292406b9eb -s ours am: ab47e042d9

Change-Id: I83e0670af1e65cddfa3fd0d33ee8cb92e7776a63