Merge changes from topic "tc_change_22080720_11" into tm-dev am: 8df08f2b am: 37014009

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



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