Merge changes If8da2ae5,I38445a13 into sc-dev am: f701c8d1d8 am: 717fb07e6c am: 4b5fb3c6c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15224092 Change-Id: I90f17355c99c5c6b564c4a94dea780e6bfd45f57
This commit is contained in: