Merge "keymaster: Relax testing under GSI" into qt-dev
am: d10841a83d

Change-Id: If9329d4a3630dd772ebb0b2183207823dc9261c1