Merge "Save and restore recycler view state on app refresh" into udc-dev am: 49c4e2d4c0 am: 1eafd15440 am: 7899ead0ce am: e404205a3e

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

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