Merge "HWC screencap portability improvement" into main am: 5f9c786 am: d8bfaae

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3228768

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

Author: Treehugger Robot

cmds/dumpstate/dumpstate.cpp

@@ -4656,7 +4656,7 @@ void Dumpstate::UpdateProgress(int32_t delta_sec) {
 void Dumpstate::TakeScreenshot(const std::string& path) {
     const std::string& real_path = path.empty() ? screenshot_path_ : path;
     int status =
-        RunCommand("", {"/system/bin/screencap", "-p", real_path},
+        RunCommand("", {"screencap", "-p", real_path},
                    CommandOptions::WithTimeout(10).Always().DropRoot().RedirectStderr().Build());
     if (status == 0) {
         MYLOGD("Screenshot saved on %s\n", real_path.c_str());