Merge changes from topic "tc_change_23050307_49" into tm-qpr-dev-plus-aosp am: acd471d0 am: d84f1819 am: 5f398e13

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



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