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: 954c599c" into rvc-d1-dev-plus-aosp am: fed445a5 am: 0fe66911

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

Change-Id: Ibe8a8440496b58c4232e6f64f3ee02ea7839aebc