Merge "Add AOSP certificates for connectivity resources" am: 410973d590 am: 1f2fdb0668 am: 3c436880d5

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

Change-Id: Ia7809d391c86f2a9aa5ce43a5d3f4c145bf12e2c