Merge changes from topic "tc_change_22082515_27" into tm-dev am: 7cd54377 am: e9026c02

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



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