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