Merge changes from topic "tc_change_22082515_27" into tm-dev am: 89f768ac am: 9c0655b6

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



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