Merge changes from topic "am-32a2d6d78f0649f983f9cdc984837f38" into tm-qpr-dev-plus-aosp am: ba59a1d8

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



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