Merge "Save and restore recycler view state on app refresh" into udc-dev am: 49c4e2d4

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



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