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

Merge "[automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a am: 4a9a5f59 -s ours am: 7aaecba0 -s ours am: 387bc6cb -s ours" into sc-qpr1-dev-plus-aosp am: 9fdc373c -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: Ib877dbae7e1c994917ac62a69a471fa6e6bc7eb4