Merge "Add AOSP certificates for connectivity resources" am: bef754dcd5 am: f6de130389 am: 343e810f30

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

Change-Id: Ia7809d391c86f2a9aa5ce43a5d3f4c145bf12e2c
tree: 5b59ee78467a146b23118127626e95cf7b5aa419
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING