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

Change-Id: I0a1ed5a0f55e433660f2e6eb87aeed6f81234089