[automerger skipped] Merge "Remove network capability from CAPABILITY_ALL constant." am: 9ffb8a6bc6 am: bae26c2434 am: b3cb4e56ea -s ours am: 930770c0c3 -s ours
am skip reason: Change-Id I888764ff22fba92fe2cccf3d8442ed318a19ad2a with SHA-1 6831749cb4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaaa29f1eef6d1fffe8acb7345d31b86716fc0dc3
This commit is contained in: