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

Merge changes from topic "tc_change_22082515_27" into tm-dev am: 95b21cec am: 97a03b9d am: aaef482e am: 20939962

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



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