[automerger skipped] Merge "Revert^2 "Add...

[automerger skipped] Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221 am: 9c4102e2 am: b5058731 -s ours am: d3cfb310 -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/+/1606546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I468372f7fb0b9bffd2636febaec31b2f8f1cc7bb