Merge "Stop using adoptShellPermissionIdentity in setUp"