Merge "Fix TimeDetectorServiceTest permissions" am: 91270ddb55 am: eb71813814 am: e420bda8ba

Change-Id: I50505029492b98466f226ed18dd238931d0dfc84