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: e18e68ff am: 0a8eb762 am: ddf5d7df

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



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