Merge changes from topic "b194508189" into sc-dev am: e922ec31aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15376189

Change-Id: I98ed8958d992a814caf8f22c833c4d2a88dd8cb2