Merge "Bug fix for NPE if FGS stop log called before FGS start" into udc-dev am: b106301547 am: b2f5dfd934

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

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