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

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



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