Merge changes I7275175e,I4422c7e7 into sc-dev am: 21e2de2d4c am: 9d5a5f9954 am: 7e649d0ba8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14420504 Change-Id: I2a106d7e54ff3beb8059ef0425c490507280bad8
This commit is contained in: