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: 1282c6eb

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



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