trunks: Fixes and enhancements to support tpm_manager on brillo am: b180754b42
am: 26412141f4

* commit '26412141f4a7794da940d7bbd81dae7bf49a3034':
  trunks: Fixes and enhancements to support tpm_manager on brillo

Change-Id: I6202cec3e7228cf143db42aa15626c94063b9851