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

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

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