[automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs"...
[automerger skipped] Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0d am: 47efc875 -s ours am: b60e1c38 -s ours
am skip reason: Change-Id Ic855100723b8604c1e872457a70fd8f25d225278 with SHA-1 b10babeb is in history
Change-Id: Icd214fb2d7c25831d0de6ca6adda43fb15ace454