Revert^2 "Improve error message when invalid display id is passed to screencap with -d argument."

This reverts commit 5e6a2497.

Reason for revert: Roll forward with fix for failing test.

Test: adb shell screenap; unit test.
Bug: 306733214
Flag: EXEMPT bugfix

Change-Id: I6b57de337f8b1278fc4452874ecc5a127b94b11a