[automerger skipped] DO NOT MERGE Revert "CACert Framework UID changes" am:...

[automerger skipped] DO NOT MERGE Revert "CACert Framework UID changes" am: 980eb07f -s ours am: a7c600a4 -s ours

am skip reason: skipped by tyanh

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



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