Merge changes from topic "tc_change_22082515_27" into tm-dev am: 95b21cec...

Merge changes from topic "tc_change_22082515_27" into tm-dev am: 95b21cec am: 97a03b9d am: bb2be681

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



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