Merge "Add a whitelist to control packages that can use Bugreporting API" am: 17492d0691
am: e54c0344de

Change-Id: I8545743ebce6206b2b8d747eb252a31282bc86cf