[automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission...

[automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a am: 2162cfd3 -s ours

am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1ac is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I38ecbed98f34106d874d1f14a4e6750dc78f2072