Merge changes from topic "tc_change_23041115_23" into tm-qpr-dev-plus-aosp am: 1214de74

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



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