Merge changes from topic "am-05342ea945c8420d8bbb3c9700d92ac2" into...

Merge changes from topic "am-05342ea945c8420d8bbb3c9700d92ac2" into tm-qpr-dev-plus-aosp am: f1ab40c2

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



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