Merge "Bug fix for crashing FGS type logger" into udc-dev am: 64941906 am: 29fb2d0f

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



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