Merge "CAN Configurator Service" into rvc-dev am: 33277cdc2b am: f4632cd593

Change-Id: I479df5585c0b6714fe7608ae079888e6b4e8acf4