Merge changes from topic "am-65afec6cbefc46e7947e0245b63c21ff" into...

Merge changes from topic "am-65afec6cbefc46e7947e0245b63c21ff" into tm-qpr-dev-plus-aosp am: d05c4150

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



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