Merge "Fix TimeDetectorServiceTest permissions"
am: 91270ddb55

Change-Id: I15dc9480414491e7e9cf809507218e80f20f8846