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

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



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