Merge changes from topic "presubmit-am-f0165140543f420b9d1abb99fdcb8891" into sc-dev-plus-aosp am: 8f79bc5100

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SafetyRegulatoryInfo/+/15636559

Change-Id: Id225c406e604aebd81f314ae13d60945241c5f2e