Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd2061cb4d29d9b129e91a68c4e6c20fdea9c5c7