tree 143388bce5f5d402d80feb4847349f3845b78883
parent ce4699a15684134482cd689e654ed14bea5e6cae
parent 8f79bc5100b64790f75fc533c2742ae83fe34956
author Bill Yi <byi@google.com> 1629517933 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629517933 +0000

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