Merge changes from topic "am-1080747de55546f48b54c2873351ac7a" into tm-qpr-dev-plus-aosp am: 85bb64e8 -s ours

am skip reason: Merged-In I13a0202b25c8118db47edba11a93c1939c94b392 with SHA-1 b6b2906e is already in history

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



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