[automerger skipped] Merge "Use committed display state in WallpaperService" into tm-qpr-dev am: 805e82ed am: 7b40cb6b -s ours am: f702fb6f -s ours am: 0e0d92d8 -s ours

am skip reason: Merged-In If747112d610822df116971b60b9a0b82a686a37a with SHA-1 7d3e0820 is already in history

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



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