Merge changes from topic "tc_change_23050307_51" into tm-qpr-dev-plus-aosp am: 04f53635

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



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