[automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes"...

[automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: d24ac0c0 am: 3ab5bb0c am: 215365f1 -s ours

am skip reason: Change-Id Iee919a40153f680d6a8b81dc88d8fa2bd1e8d343 with SHA-1 3512b3cd is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1615259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9da1c2325138c1d3cbc35cc9023a9d613facb501