Merge "Fix symmetric key generation in strongbox" into pi-dev
am: 0e43e2ef96

Change-Id: I154ab21e8f0d804225f993d187e2aad66a5cdeac