Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062 am: 8fd8b5b234
am: f67ba767a0

Change-Id: I321948af64ad9e6299d893647de77ff20d6f1363