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

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

Change-Id: I826525f2e7a4072ff4cbe44b64ef51f41aa6b83e