[automerger skipped] Merge Android 12 am: 608315518e -s ours

am skip reason: Merged-In I6ee17a46a996524dae41452ca769c88fdea78e3e with SHA-1 f40dd86e52 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/hwservicemanager/+/1847452

Change-Id: I3b1dc9f7f296ac1881a9747e6f56c3750592912b