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

Merge changes from topic "tc_change_22082515_27" into tm-dev am: 89f768ac am: 00582fb6 am: 3e7b2bcb am: df863a1c

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



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