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

Merge changes from topic "am-6e211d057385482094e3c15ffd4b3efe" into tm-qpr-dev-plus-aosp am: 08203543

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



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