[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: c209a5602f -s ours am: 87bc94561b -s ours

am skip reason: Merged-In I3c87188f2284ea01d0ce2697eba51c4d0a106d19 with SHA-1 e57e367bc7 is already in history

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

Change-Id: Iba660e50e0319d8cb69811d81bec682f04065e04