Merge "Prune BugreportManagerTestCases out of general-tests." am: 217ec71c8d
am: d49a61b08c

Change-Id: I4f649a219a9f751a6d70fe5f3f3a404a125bc433