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

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



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