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

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



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