Merge changes from topic "am-525ec6f7926f493bb01f6d8582ccf1d1" into...

Merge changes from topic "am-525ec6f7926f493bb01f6d8582ccf1d1" into tm-qpr-dev-plus-aosp am: 20dc29c6 -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 aa14df0e is already in history

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



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