Merge "Merge "Fix a race conditon in `incident`." into rvc-dev am: 7b35bb38...
Merge "Merge "Fix a race conditon in `incident`." into rvc-dev am: 7b35bb38 am: 2dc6307e" into rvc-d1-dev-plus-aosp am: c88055e1
Change-Id: I68a221c55f5a8575d8becb2ed5e96b9efb854834