Merge changes from topic "wallpaper-canvas" into tm-qpr-dev am: faa4ecba am: 278a5587

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



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