Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am: 9816c0ce86 am: 248a62077a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2b3702999d176c2ed86a6e0e9f05cf59563f5e2