Merge "DO NOT MERGE Revert "CACert Framework UID changes"" into...

Merge "DO NOT MERGE Revert "CACert Framework UID changes"" into aosp-24Q3-ts-dev am: a8a41f98 am: 501647e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29026690



Change-Id: I1b06e6907cf9e158e387f8688395427c2f85da25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>