Merge changes from topic "am-d3a277e5a5634b6e9b1b5859802bde21" into...

Merge changes from topic "am-d3a277e5a5634b6e9b1b5859802bde21" into tm-d1-dev-plus-aosp am: 49caba43 -s ours

am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 b4a2d3a7 is already in history

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



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