Merge "Save and restore recycler view state on app refresh" into udc-dev am: 49c4e2d4c0 am: 1eafd15440 am: 059c08f589 am: 4083b220f3

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

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