Merge changes I851f9fb9,I60dbcb24 into sc-dev am: 0f97905040 am: 8bd71d5f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13933219 Change-Id: I0a57feb2ea8aac26eb18364454c8e23f8dbcb1ca
This commit is contained in: