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