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

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

Change-Id: Ifa29b6c542a1b229d5fe32cf81c5189541af3f28