Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev am:...

Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev am: 73324644 am: 5d07e1a2 am: 7d5fd430

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



Change-Id: I661f2f5900a743773a8cec5c515f312e8fffac6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>