Merge changes from topic "b194508189" into sc-dev am: e922ec31aa am: ad6a933594 am: a46c938337
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15376189 Change-Id: I46fa7856960670495b78abff270108fc3f77ff72
This commit is contained in: