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

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

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



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