Merge "Keeps picker quick pick correct when switching home/lock tabs (2/3)" into udc-dev am: 1cde12bc1c

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

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