Merge changes from topic "tc_change_23041807_34" into tm-qpr-dev-plus-aosp am: b468efc7

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



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