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

Change-Id: I696442dd3c92d54b0a90f21f1936e806ded65d08