Merge changes from topic "presubmit-am-d4dc4c006a0c45528e886e4f5c7b20d6-sc-v2-dev" into sc-v2-dev-plus-aosp am: 2cba1980 am: fea70e37

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

Change-Id: Ic13439bbec5ec13dcf46e59dbbfbdf291230f37a