Merge changes I6b4df388,I07becea2 into sc-dev am: ce8ca17d89 am: 609717560a am: 6af3547230
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191539 Change-Id: I769d3548fbc719ff7c200ab439b5612e8ab85c77
This commit is contained in: