[automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am:...
[automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am: 61265bff am: 97e96799 -s ours
am skip reason: Change-Id I602ae32dae1ad29fe3293c541fa6d2cef01b81d3 with SHA-1 a1d19764 is in history
Change-Id: Id82ae0b4426104a64758a9426e165d1c69087379