Merge "Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc am: 6d8274ebf1 am: fbb48a210f" into pi-dev
am: 601861fd1c Change-Id: I6605aad319ea268827f47d95fb6aef7c4c07ae93
This commit is contained in: