Merge "Fix signature-host-tests broken by previous change" into android11-tests-dev