[automerger skipped] Merge "Adding GetVerifiedBootParams to soft keymaster context" into rvc-dev am: 3d85d69171 -s ours am: dc0f221b17 -s ours am: 1157b0ea80 -s ours

am skip reason: Change-Id I85be3717ed74c4ae3da13e6ba38a65a7213364d0 with SHA-1 8ccabc9a5c is in history

Change-Id: I2c1ed1a6ffdfba7e981ae4d258f0ded4eeb67edb