Merge "Merge "Minor clean-up in NetworkCapabilities" am: 1dd43b192c am: 6ab3c9c246 am: 5d97ad9fe4" into pi-dev
am: 601861fd1c Change-Id: I6605aad319ea268827f47d95fb6aef7c4c07ae93
This commit is contained in: