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

Change-Id: I6b792aba6ca4ca2f6b43256080e6dff230aca370