[automerger skipped] Merge redfin/bramble support. am: 696ab1c983 -s ours

am skip reason: Change-Id I17b1f853fee7ca947fb8cf7c1328390455da52bd with SHA-1 985301a948 is in history

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

Change-Id: I68f8c39c1c516f4338abb7ec433bd2ba5017e519
tree: 802f3f0aae9127818f8d64879a04a08473e6a4ea
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS