Merge changes from topic "wallpaper-refactor" into tm-qpr-dev am: e9cb2348 am: d143a7cd

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



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