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