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

Change-Id: I0b791a12cdee5dc5ce4bdc1c27eecd8b0166fc15