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

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



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