Merge changes from topic "am-cdd85bd666984e61ae32a4dd59c0d83e" into android11-tests-dev * changes: [automerger skipped] Merge "Move retired CA certs to optional array" into android10-tests-dev am: fa95975c8d -s ours [automerger skipped] Move retired CA certs to optional array am: cf4d3ba351 -s ours