Merge changes I5ce7fe05,I2d5dc5b9,Ibcc4bdc0 into sc-dev am: 211f7f9e20 am: 8aee0b0e3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14702006 Change-Id: Ic270ca7b74f9db6352bb2006283f3af64b6b941b
This commit is contained in: