[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 516068ee -s ours am: de282743 -s ours am: 36549796 -s ours

am skip reason: Change-Id Iac158e7721f651cc0d041fd310d01808d549a4db with SHA-1 864d4803 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12804332

Change-Id: Iccee58ca53e0e5655956075a982da5582c97670b