Merge "Respect limited requirements for Strongbox KM implementations" into pi-dev
am: 17be71d397

Change-Id: I2cb4e092e73b2be63462593187982858262c3e3a