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

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

Change-Id: I4f82dacb12e19c6db2898fb98511c066cb965aac