Merge "Add a toggle on whether or not to prompt the user on long-running FGS" into tm-dev am: c772fd959c am: 4e59d9287b am: 117c81a212
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18960077 Change-Id: Ifef1c82d497aa5839a91255baa4be2aa32d812f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: