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 am: a12b1259 am: 0052b09b am: 0de671ac

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



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