Merge changes If03d8ee3,I701d9d6f,I715e0e53 into sc-dev am: 73ffe99b7b am: cc0975455c am: 0cca1436f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15193088 Change-Id: I2d198232b23b6f780b679ced9b8a4cac494fb8e5
This commit is contained in: