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

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

Change-Id: I86b2082e674317ec8f8cd0b9831889da85918c27