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

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

Change-Id: Ic338630df439bdf40baf85a48bd795b073bc6e38