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

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

Change-Id: Icd38d61d2699ff146ac4ef554c1a3033f15dbfa1