Merge changes from topic "tc_change_22082515_27" into tm-dev am: 89f768ac am: 00582fb6 am: 3e7b2bcb

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



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