Merge changes from topic "tc_change_20" into tm-dev am: 697cc4c6 am: 4c7d273a

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



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