Merge changes from topic "b194508189" into sc-dev am: e922ec31 am: f6a51497 am: cdb8e93c

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

Change-Id: Ia5c298f89fc47277764e9a1e2263f27671e21615