Merge "Revert "CameraMetadata: Add trace points CameraMetadata operations"" into rvc-dev am: 3e58083f21 am: cb820d90be am: 9392b3f93a

Change-Id: Ibae4476348c0d1ce7b06873f01704ac651da5d7b