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

Change-Id: I4c62ef3c49a2c4c5835aad74673ca3cdbfb24f61