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 am: 4686f86a

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



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