Merge changes from topic "tc_change_22082515_27" into tm-dev am: 95b21cec

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



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