[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363"...

[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 618c76e5 -s ours am: 477fb762 -s ours am: 0cba7cd5 -s ours

am skip reason: Merged-In Id23fa2f0004319f4ee592e19dc34a6b74cdb644f with SHA-1 c621d8d2 is already in history

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



Change-Id: I3869ed3449ce924e7c8bdf740954d50fe968e7dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>