[automerger skipped] Merge "IWallpaperServiceWrapper keep track of multiple engines" into udc-dev am: e427865078 am: 798b77c2b9 -s ours
am skip reason: Merged-In I5606cec182bdc4d24eda03a05849d6a2aab39d61 with SHA-1 fda87b9daf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21482810
Change-Id: I7f791bf2ee8e0769602f1445691a007c8ecf543b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: