Merge "Fix race in TelephonyScanManager"
am: 884dd0f559

Change-Id: If79d695c2bdb83cf7c902bc540da5b8b427268f4