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

Change-Id: I56a5296a3e5fb1971eea8685dde6dd574b2b1bea