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 am: 22b6a0d0

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



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