[automerger] Merge "Respect limited requirements for Strongbox KM implementations" into pi-dev am: 17be71d397 am: 688f39cb26

Change-Id: I8a4cfdda2492e70942d15f36b14b8fa0ab7c010f