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

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



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