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

am skip reason: Change-Id I85be3717ed74c4ae3da13e6ba38a65a7213364d0 with SHA-1 2a32fb9d1d is in history

Change-Id: I2f5a7f7ee21da910ccf6075df8f404937562fe63