Merge "cameraserver: Make trace points in HFR code paths optional." into rvc-dev am: 9cc5cecf18

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11982638

Change-Id: I6bb346f2cba6847dbd11033cac48bff57ed6f51e