Merge changes from topic "tc_change_22082515_27" into tm-dev am: 89f768ac am: 9c0655b6 am: 997f1514

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



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