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

Merge changes from topic "am-c2b668e9bcdf4b9aaa3a83bff120b73a" into tm-qpr-dev-plus-aosp am: 22f62749

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



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