Merge "Directly set custom actions to be used in left/right control bar slots" into pi-car-dev
am: 35e57c3ca2

Change-Id: I979fa9e8701eb4a4040daf4aae55fa507f8f309f