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