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

Change-Id: I75551184a50e7bfe9cebd9b649bfd71acf5ac0f7