Merge "Introduce CAMERA_SERVICE_CURRENT_STATE VHAL property" into main