trunks: Refactored TpmState. am: ce32afbb30 am: df3a5b9734 am: 3d3af5530f
am: 07830337c6

Change-Id: I41626e1556de4458a7f28a1acbc28d9653fa19f9