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

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



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