Merge "Skip reset wallpaper operation if users have changed wallpaper" into...

Merge "Skip reset wallpaper operation if users have changed wallpaper" into tm-dev am: 2f48d97c am: 63c36fc6

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



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