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