Merge changes from topic "tc_change_20" into tm-dev am: 932e0369 am: a04e35fb am: 5fbf943b

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



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