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