Merge "Adding GetVerifiedBootParams to soft keymaster context" am: 578c06897f am: a519f21e1a

Change-Id: I5b6171ecd2dbb382119970b4d29dab6eb022578c