Merge "Bugreport Manager service clear binder identity" am: 1f6b8f50c1
am: 32538e15a3

Change-Id: I50615918e195f60790ff6f9cadf2cfc063a682f8