Merge "Adding GetVerifiedBootParams to soft keymaster context"