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

Merge "Merge "nfc(api): Remove fg checks from API class" am: b963d9a0 am: c4e29775 am: 2ec66df6" into udc-dev am: 690c568f am: 4fe1371a

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



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