Fix race in TelephonyScanManager
am: 8718323a76

Change-Id: I539a2bcddac00d67a297408242524f86b4928d9b