[automerger skipped] Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am: 9816c0ce86 am: 248a62077a am: 604c3e2863 -s ours

am skip reason: Change-Id Ie31d32a08b10b8c125f27832e81a3e65b6d8767a with SHA-1 e177c09787 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7c8732e7e1e6c504f0ffd2dc17053adc0030fab