am 80bc5086: am e12431bf: am 84745dd1: Merge "Disable TvInputManagerService on non-TV devices." into lmp-dev
am 80bc5086: am e12431bf: am 84745dd1: Merge "Disable TvInputManagerService on non-TV devices." into lmp-dev

* commit '80bc5086cda12370f031095e98b20e6b7cc4f667':
  Disable TvInputManagerService on non-TV devices.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base