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

[automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a40 am: 4bf02f22 am: 4c8d91f2 -s ours am: 1971fbc7 -s ours

am skip reason: Change-Id I48d36d73d016f7aa7fabec25a725abe03b1dee8d with SHA-1 ed6078c0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc9b659e692914b55225437589462a7ff7e41b07