Merge changes I6b4df388,I07becea2 into sc-dev am: ce8ca17d89 am: 609717560a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191539 Change-Id: Ic4643d4475f3df74441d7c73f89eacc785372814
This commit is contained in: