Merge "[automerger skipped] Remove RESOLV_INJECT_CA_CERTIFICATE am: 3665a1c9...

Merge "[automerger skipped] Remove RESOLV_INJECT_CA_CERTIFICATE am: 3665a1c9 -s ours am: dcce32ac -s ours" into rvc-d1-dev-plus-aosp am: f7801c80 -s ours

am skip reason: Change-Id Id03566dcaceab0f8c78fe705cb8f6f6c806082ca with SHA-1 18f64f19 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/11824578

Change-Id: Ice4cf0c20c6424df0e43e2917bf0b74ce07203d9