Merge changes I7a3ba2af,Ifa89ae43 into sc-dev am: 0f1dd468bd am: ca4e09d0c1 am: 2b53745ea7 am: 9c3072212c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504100 Change-Id: I5a60eac8978ea7af731ba97461b35c001e1bd3ee
This commit is contained in: