Merge changes I6f314a65,I8020f029 into sc-dev am: e5c0de0d2e am: c41cddf01d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15285881 Change-Id: I278d4bfb99f34c1839566f8d4bad962a748f7ca8
This commit is contained in: