disable hardware key bugreport the right way

Change-Id: I0bbae248a77c1db7462bdd5f0fae2bc005b70b0c
Merge "disable hardware key bugreport the right way" into jb42