[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: e4b0280d80 -s ours

am skip reason: Merged-In I4ab4355119f0ea2c827616791e2d544fcb6dd84a with SHA-1 c3fa23c733 is already in history

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

Change-Id: I6f22118145dc290ab9c09c0dc5eadd4e7edac090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 67dceee55b5eafd2fa39eda27cbf306d4c551e2e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. LICENSE
  6. OWNERS