Merge changes from topic "tc_change_22082515_27" into tm-dev am: 45373f06...

Merge changes from topic "tc_change_22082515_27" into tm-dev am: 45373f06 am: 0bda89b6 am: e838ad33 am: 3d6bfd45

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



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