Merge "Revert "nfc(api): Remove fg checks from API class"" am: fb519f33 am:...

Merge "Revert "nfc(api): Remove fg checks from API class"" am: fb519f33 am: 7230f4cb am: 04165cf7 am: 1a889f94 am: 52793d1d

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



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