trunks: Refactored TpmState. am: ce32afbb30
am: df3a5b9734

Change-Id: Ie784ab5fdc1f12aa5f664c10974bcc83e8303ab3