Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: ded6a9e58e am: 804e6f75cd

Change-Id: I3b07f1715e550568014becb9f987963777da4bba