[automerger skipped] Merge "Remplace NetworkIdentity.OEM_* with...

[automerger skipped] Merge "Remplace NetworkIdentity.OEM_* with NetworkTemplate.OEM_MANAGED_*" am: 6f39fc9e am: 84f8974e am: 3edeb551 am: c1d3a3e7 -s ours

am skip reason: Merged-In I8b980417faf776b9b7b0fbcc4f04525b516452a0 with SHA-1 fe43f4d5 is already in history

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

Change-Id: Iedf57545ea64706c87a9b17e89d9752bf1474268