Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am: f2627d08 am: 7cc815f8

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



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