Merge changes from topic "am-554da91f996f4a79bb6f61ca04267ac5" into...

Merge changes from topic "am-554da91f996f4a79bb6f61ca04267ac5" into tm-qpr-dev-plus-aosp am: 9558e021 -s ours

am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 89ebc8c4 is already in history

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



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