Merge "Add more fields to FGS_STATE_CHANGED atom." into udc-qpr-dev am: 08bb355a6a am: 6bf297faa2

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

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