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 am: b4f57415

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



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