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: 21b8c732 am: cf783215

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



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