Merge "Adding hooks for FGS API logging in cameraserver" into udc-dev am: 4f1e0bc8 am: 7701e590

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



Change-Id: I9ad080c3d5afcda9032e59d66b36bf87d9570c08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>