Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: d24ac0c097 am: 3ab5bb0c2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b7bfe80fbd9dba7745a8157718e9b2a8061546d