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