[automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36 am: 4c3ce3670c -s ours

am skip reason: Change-Id I602ae32dae1ad29fe3293c541fa6d2cef01b81d3 with SHA-1 88cef1a242 is in history

Change-Id: Id82ae0b4426104a64758a9426e165d1c69087379
This commit is contained in:
Lucas Lin
2020-03-30 08:20:35 +00:00
committed by Automerger Merge Worker

Diff Content Not Available