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

Change-Id: I94e516ab6a0bc1e6277f4b4f00362807b094c8d7