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

Change-Id: Ic131db7d4353f2212f6e4b91fe7284e1cda74d11