Merge changes from topic "tc_change_23050307_41" into tm-qpr-dev-plus-aosp am: 7836332b am: 38da0447 am: ca363f12

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



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