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

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

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