Merge "Merge "Use installed keystore alias to check if enterprise config is...

Merge "Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev am: 0a327227 am: c7ae85f4" into rvc-d1-dev-plus-aosp am: 854bf943

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

Change-Id: I94b2cb2f75f3760e466e951044915b74832fc112