Merge "Hiding Always-on VPN and Trusted CA Certs if FEATURE_MANAGE_USERS is not supported." into oreo-cts-dev
am: 752f0faa38

Change-Id: Ie112d9b91e62dfbc95008dac7a2ea5e5d9d486e7