Sync patch r15360 from main trunk.
Fix current TPM device string missing. Use efivarstore instead of varstor, remove TPM disable.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@15361 6f19259b-4bc3-4df7-8a09-765794883524