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

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



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