Merge "Skip multi display wallpaper test on no supported devices" am: 29241a943a am: 4ec6db30d3

Original change: https://android-review.googlesource.com/c/platform/cts/+/1483877

Change-Id: I95dd8b3c9162117e7f450fe315b6ea113161a111