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: 1b7146fa

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



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