Merge "Add NetworkCapabilities#deduceRestrictedCapability" am: 39ac72436e am: 21da34591b

Change-Id: I3b07f1715e550568014becb9f987963777da4bba