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: b907b955 am: baa0ed97

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



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