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

Merge changes from topic "am-ce4445973a4948d291d2d034a63aff3f" into tm-qpr-dev-plus-aosp am: d9a1098d

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



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