Merge changes from topic "b196691596" into sc-dev am: 7b3e40dd63

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

Change-Id: I50335e5cd90cd7a2260d9487c1f1a1c9791e5345