Merge "Remplace NetworkIdentity.OEM_* with NetworkTemplate.OEM_MANAGED_*" am: 6f39fc9ee7 am: 84f8974ecc am: 3edeb55188

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

Change-Id: I8da0da084259c4b4af44820e83c9862c71cd3ee7