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: Iab55f8661e641bca6bcd41a1949be6ca1a02bfc7