[automerger skipped] Merge "keymaster: skip SHA2 digest tests for strongbox" into pie-vts-dev am: 86104dcc18  -s ours
am: 624a5cbaa6  -s ours

Change-Id: Ica6a7d0c35a5e8fce9f5fd6e7af7db2c553cc4a1