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

Merge changes from topic "am-b8b15790a5e34b47bb5faa11d7c66537" into tm-qpr-dev-plus-aosp am: 72754a87

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



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