DO NOT MERGE Revert "CACert Framework UID changes"

This reverts commit 213372217fd10bef44db1e70b323805a3ca00b54.

Reason for revert: ag/28817258 is the proper fix

Change-Id: I1c52b37b43f2860caba8ea791b7efafd573cc5ea
2 files changed