Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f
am: 246764009c
am: 5e09274023
am: 9f8b8b376d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942 Change-Id: I56e50888a4352068271aaaead61e17bc7ceb10d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: