Merge "Expose CarInstrumentClusterManager to system apps" into pi-dev