Merge "Auto-scroll to the selected quick affordance." into tm-qpr-dev am: 3de761e8eb am: 7b57c7e1b3

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

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