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

Change-Id: Ib6b0a6906a8d61b40a3ffd4191136474c0f94274