Merge "Add a toggle on whether or not to prompt the user on long-running FGS"...

Merge "Add a toggle on whether or not to prompt the user on long-running FGS" into tm-dev am: c772fd95

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



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