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>