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: 53f81691 am: 40f23cb7

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



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