Merge changes from topic "am-6c9dcac8705a40319da82b6168b09dcd" into...

Merge changes from topic "am-6c9dcac8705a40319da82b6168b09dcd" into tm-qpr-dev-plus-aosp am: 7abea8f7

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



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