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: I2df4c39742f1060577c8df98d8c0854e83cc152b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>