Merge "Look for hwservicemanager in it's old location as well" into main am: 424964b8f7

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2744313

Change-Id: I351fb6e50ca7dad86f1cd8d78a612e4612e78af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 78c1e96..6d85b57 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -211,7 +211,8 @@
 }
 static bool isHwServiceManagerInstalled() {
     return access("/system_ext/bin/hwservicemanager", F_OK) == 0 ||
-           access("/system/system_ext/bin/hwservicemanager", F_OK) == 0;
+           access("/system/system_ext/bin/hwservicemanager", F_OK) == 0 ||
+           access("/system/bin/hwservicemanager", F_OK) == 0;
 }
 
 /*