[automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am: 45bf0aab18 am: a99cb3677c -s ours am: c05e8bbd61 -s ours am: c13739ce5f -s ours am: 0df8f0a1d0 -s ours
am skip reason: Change-Id I602ae32dae1ad29fe3293c541fa6d2cef01b81d3 with SHA-1 e0bf23d34f is in history
Change-Id: If3f64e991c1a975defd6924b930ecd1f1859d97a
This commit is contained in: