Merge "Add AOSP certificates for connectivity resources" am: bef754dcd5

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

Change-Id: Ia8e130fe84aecefb29ee8eded1fa480517ac4ebf