Merge "Add flag to intent in AccountAccessSameCertTest"