Merge "Merge "Keep track of two top wallpapers to improve the control over...

Merge "Merge "Keep track of two top wallpapers to improve the control over each." into udc-dev am: a54b7778 am: cfb05591 am: 746a0229" into udc-qpr-dev-plus-aosp am: a2e586d3

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



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