Merge "Update wallpaper target if the current target is gone" into tm-qpr-dev...

Merge "Update wallpaper target if the current target is gone" into tm-qpr-dev am: 50aee330 am: 630b3dcc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125378



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