Merge "Fix double wallpaper attachment (race) when it is gone" am: a682d081...

Merge "Fix double wallpaper attachment (race) when it is gone" am: a682d081 am: 4065ff1f am: a6f8ff3e am: adf0f730

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



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