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

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



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