Merge "[TP] Refector wallpaper picker injectors" into tm-qpr-dev am: 3dcc641cbe am: 52eca83bd7

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

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