Merge changes from topic "tc_change_22082515_27" into tm-dev am: 7cd54377c2 am: e9026c0298 am: a6ac50cf02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19742328 Change-Id: I0b3901cdcdda48d38d0f9f921f1619d1696f2d96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: