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

Merge changes from topic "am-c02fc5d1435f465c9368d633d00379c4" into tm-qpr-dev-plus-aosp am: 79e1ab48

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



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