Merge "Handle multiple phoneIds in time detection" am: 51c61e8bdb am: 1602545f28 am: 161d1764c8

Change-Id: I49c060f1369d382f82d91f729d8fd099d4a217d4