[automerger skipped] Add usb and networkcapabilities back to core/proto am:...

[automerger skipped] Add usb and networkcapabilities back to core/proto am: 185bb901 am: 6d2b61df am: 8d152af2 -s ours

am skip reason: skip tag Change-Id I055a3ca44b83921018697bdefec29161b483d0fe with SHA-1 d825d184 is already in history

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

Change-Id: I481972bb025749863d9585e0a83a17abaf135047