[automerger skipped] Merge "Disable the buginfo dialog on AndroidTV" am: 7eaa2cbf51 am: 70509bba06
am: 8baff12042  -s ours

Change-Id: Ia21c3184690ef4b905c11c4200943579b41379cd