[automerger skipped] Merge "Add a whitelist to control packages that can use Bugreporting API" am: 17492d0691 am: e54c0344de
am: 36abd0a7e8 -s ours
am skip reason: change_id Id0b61ccc1adf40bcb455d3b59b640f4b160bdd84 with SHA1 07964b49ac is in history

Change-Id: I4aa30f899c83e80d07837adc2921b9f9b6261707