Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb1 am: ca861105

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942



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