Merge "[automerger skipped] Allow only AID_ROOT to inject certificate am:...

Merge "[automerger skipped] Allow only AID_ROOT to inject certificate am: e951685d am: 2150192b -s ours am: 6a84c814 -s ours" into rvc-qpr-dev-plus-aosp am: bfbed80d -s ours

am skip reason: Change-Id If71c0171bc4347979e278752fc49877359f056b7 with SHA-1 e951685d is in history

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

Change-Id: I2e64748279f50b069f789bce41fc44acc6134558