Merge "Save and restore recycler view state on app refresh" into udc-dev am: 49c4e2d4c0 am: 36e418bf01 am: 9c99e353f1

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

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