Merge changes from topic "am-638554458380438588e7ce2d0324a6a3" into tm-qpr-dev-plus-aosp am: 8028865f

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



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