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

Change-Id: I19cd4e7a4cbfd9d2677a19b3df7782edd21bd46c