Merge changes from topic "am-18ca3288f6af4f0db26806b0693afa74" into...

Merge changes from topic "am-18ca3288f6af4f0db26806b0693afa74" into tm-qpr-dev-plus-aosp am: 90531e64

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



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