Merge "Add AOSP certificates for connectivity resources" am: 2b41bf80ee am: 582734224c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645

Change-Id: Ifa29b6c542a1b229d5fe32cf81c5189541af3f28
tree: e6c306c2b39b941347c557dd3e42bfa3cda83abe
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING