Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp am: 5e4e1dec67

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

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