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

Change-Id: I9d593d245287362aad82d70ac5fed4d6339f82d7