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

Change-Id: I2abfbcfbf39d9b82e581d91c873481ef4327cacb