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

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

Change-Id: Ie2ca82db9647a820d9a39d35e0c65b1f8b879a36