Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev am: a5f08bda7e am: 969e191f96

Change-Id: I97db0c4a2a33398ba9bf98665655a46931d9a43c