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

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

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



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