Merge "screencap: Allow virtual display ID in -d switch" into udc-dev am:...

Merge "screencap: Allow virtual display ID in -d switch" into udc-dev am: 250376b0 am: 61c1a0e2 am: be034cf8

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



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