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

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

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