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

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

Change-Id: Ia730d3c3a3748f5f8e5d3dc5139041fddb513a98