Merge mainline-release 6664920 to master - DO NOT MERGE am: 6f4764cbe6

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

Change-Id: I366eb6b31f426b38a7b3d1592f72ae7f58f57c68
tree: 73094c54d8257e623b8867f6f7e80901021722de
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS