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

Change-Id: Ic0e06f7039938f66743ea12f2886d7d8bbb66d5b