[automerger skipped] Merge "Adding GetVerifiedBootParams to soft keymaster context" into rvc-dev am: 3d85d69171 am: b034469f3d am: 1fb786cbb0 am: f022b8e937 -s ours

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

Change-Id: Ie999ba1f1a82ced4be1dd4e570b75b9943567634