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

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

Change-Id: Iaff4415ebcf479bb61d8bc3ccbdf0ac77ec49543