[automerger skipped] Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am: 9816c0ce am: 248a6207 am: 604c3e28 -s ours am: 089fd978 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8c5631a2bd9016fc0dff6b8cc1cd60048069654