Merge "Revert "CameraMetadata: Add trace points CameraMetadata operations"" into rvc-dev