[automerger skipped] Merge Android 12 am: 5807542208 -s ours am: 92133cae77 -s ours am: c661274424 -s ours

am skip reason: Merged-In I5858ea02ccf1ff6e74acb641c37d2733b9c5bc18 with SHA-1 c209a5602f is already in history

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

Change-Id: I550486aa5e362a492b7725f302448c1428f6e903