Merge changes from topic "tc_change_22082515_27" into tm-dev am: 89f768ac am: 9c0655b6 am: fcfbec74 am: 06c287db

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



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