Merge "Allow null setup activity for TV input" into oc-dev
am: 90074d1ec8

Change-Id: I18545582572c60956548af8c732b7e6543f00d76