Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Bug: 181335996
Change-Id: Ib29e39622ec998bc911cdd5ec220692c7b6f5ea0
(cherry picked from commit b50587319e23e76032d496526825b55aad30a35c)
3 files changed