Merge changes from topic "am-34c55ad1658d448aab568b7aecf72ae0" into tm-qpr-dev-plus-aosp am: ae355cf4 -s ours

am skip reason: Merged-In I80fabf3a64c55837db98ff316e7e5420129c001b with SHA-1 cf62c760 is already in history

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



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