[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: af6a13ab79 -s ours

am skip reason: Merged-In I4b08cd9ff3e938152ae7d58f5cda2beb922c08ff with SHA-1 b5c3b79b4e is already in history

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

Change-Id: Iba7d955c3a89c249ee613adeeeb77d5ca4bc995f
tree: 63a8cd00f1bbc49a430ed0825bd151880d31e9d1
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS