Merge "Merge "TIF: Throw a more appropriate runtime exception when building...
Merge "Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b963 am: b2e2d268" into nyc-mr1-dev-plus-aosp
am: 45fab75a
* commit '45fab75a':
Change-Id: I487c649bea97ec9fdc07975d11d47c9697baf370