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

Change-Id: I6bf02f80c9b505592d0a08c1056ca96e363119db