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

Change-Id: I9c97d02153f2ed2faf6d1751009642179451e7af