Merge changes from topic "tc_change_22071422_22" into tm-dev am: 106e27a7 am: ad8e9f18

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



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