Merge "Include NetworkCapabilities and LinkProperties in DataStallReport." am: 3939d29c0b am: b3a0f10a8e

Change-Id: Ifc6f6a919986305002d2e2c60aa3cda8f0b8b5ac