Merge "Add component name in FGS WTF log" into udc-qpr-dev am: b1be8a3150

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

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