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

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



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