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

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



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