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

Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into tm-qpr-dev-plus-aosp am: 40683b10

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



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