Merge changes from topic "tc_change_22082515_27" into tm-dev am: 45373f06 am: eddb1679 am: 03f986f7 am: 342fcc7c

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



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