Merge "Merge "Fix a race condition on ReportHandler::mBatch" into rvc-dev am:...
Merge "Merge "Fix a race condition on ReportHandler::mBatch" into rvc-dev am: 66639a4f am: 69a4e6f1" into rvc-d1-dev-plus-aosp am: 9bcdb802
Change-Id: I5d1b3a87d46d3dd3f246552d1f3612e037b4ca6d