Merge "Disable the buginfo dialog on AndroidTV"
am: 7eaa2cbf51

Change-Id: If32bf9933b2443839391ac7d326778112937de90