Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
am: 7b911fbdaf

Change-Id: I9f75901dcbaace37a44971a0e2b2dba02dedfa00