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

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

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