Merge changes from topic "tc_change_20" into tm-dev am: 697cc4c6 am: 2b59ffce am: 5d9d6249

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



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