Merge "Add calling uid and calling package to startBugreport" am: 458f1de39d
am: da9d6ea2ae

Change-Id: Iaddc6878f2b2d085b794b1e942f4a9ed9517a455