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

Change-Id: I10a56f6e0c5a72d5332769b23ee3c5f3718f403a