Merge "[DO NOT MERGE] Fix testNoAddedCertificates failed on GlobalSign E46 and R46 certificates" into android10-tests-dev