[automerger skipped] Merge Android R am: 1e336fbf3a -s ours am: 611acf9140 -s ours

am skip reason: Change-Id I5f7f3e51d58b8447db8001bba59af73cc9a6bbf1 with SHA-1 6b1fb51bf9 is in history

Original change: https://android-review.googlesource.com/c/platform/system/ca-certificates/+/1422485

Change-Id: Ie233d85b44d5bcdcc62369cbaba7b6f133541742
tree: e1ad9714a372ff8e7c82fa514a436c79bbf3dfc2
  1. files/
  2. google/
  3. soong/
  4. wfa_certs/
  5. Android.bp
  6. OWNERS
  7. README.cacerts