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

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



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