Merge "Merge "Bug fix for crashing FGS type logger" into udc-dev am:...

Merge "Merge "Bug fix for crashing FGS type logger" into udc-dev am: 64941906 am: 5fc0875d" into udc-d1-dev-plus-aosp am: 0795da20

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



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