Merge changes from topic "tc_change_22082515_27" into tm-dev am: 7cd54377...

Merge changes from topic "tc_change_22082515_27" into tm-dev am: 7cd54377 am: f695351f am: 686d2a9d am: b352f700

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



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