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

Change-Id: I21ba7e6502e06064a443a701b1953d3dff60b653