Merge "Add IIncidentCompanion binder API."
am: b5fd6ace3e

Change-Id: I13b8b2c2e60d56635ad66c376f68a0a016eff2b1