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