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: I284f3f3f974ffae41e39933983e2f53143ab7b6c