Merge changes from topic "am-6a89556b0f144a87abc7fcd05a7de322" into tm-qpr-dev-plus-aosp am: d940dff7

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



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