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

Change-Id: I86dc97915f580ea0036d91335366a81123f105ad