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

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



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