[automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
am: d858122105
am: 857753c2bc
-s ours
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babebd0
is in history
Change-Id: I8049d17b31fa4c6ad301852190ba08662879e2d8
This commit is contained in: