Merge changes I4f49bb96,I8c8ee829 into tm-dev am: 0423dff207 am: 41c3f95ebe am: f4fdb88845
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988653 Change-Id: I560cbb763061a6815a6353783d0b1e48b257f18b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: