Merge "Revert "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: 3e21e0ab47

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If85b6a500b5c7b304ad1f30a00cd4e49bd062a89