Merge "Fixes activity leak in Wallpaper Picker." into udc-dev am: b7c4aec8b0

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

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