Merge "Merge "Add SETTINGS_SLIDER CUJ to InteractionJankMonitor" into tm-dev...

Merge "Merge "Add SETTINGS_SLIDER CUJ to InteractionJankMonitor" into tm-dev am: 6474aed2 am: 914b9b55" into tm-d1-dev-plus-aosp am: f1b882b6 am: a8147633

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



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