Merge "Revert "Expose new API for querying whether a certificate was user added.""