Merge changes from topic "b-186518774" into sc-v2-dev-plus-aosp am: 45852c25

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

Change-Id: I36bdf1ff5a6d6ebb249f68dd6d074a0d8f40f3c5