Add usb and networkcapabilities back to core/proto am: 185bb90134 am: 6d2b61df0d

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

Change-Id: Ie92e995d2ded2a5a0f6addb596dc7f9385e8a684