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