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

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

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