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

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



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