Merge "Add IIncidentCompanion binder API." am: b5fd6ace3e
am: cbf0f32512

Change-Id: I59d077ddee2ab60a3d3ee073eaae68f4605e9fe9