Merge changes from topic "tc_change_21" into tm-dev am: 7bd6d9e1 am: 4abf9e3d

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



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