Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870 am: 1484d1a4

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



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