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

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



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