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

Merge "Keep track of two top wallpapers to improve the control over each." into udc-dev am: a54b7778 am: 55e6e86f

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



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