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

Merge changes from topic "am-f8d5de2cbb804e70bc0e4c917a416354" into tm-qpr-dev-plus-aosp am: 835e5f42

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



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