[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f40dd86e52 -s ours am: c4e2c55d52 -s ours am: 2a86ce9bec -s ours

am skip reason: Merged-In I937e1382b9968adff860f2295cb4052f8d183436 with SHA-1 e532e00132 is already in history

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

Change-Id: I342b1013f1ff183cde3b5409393d5041be9a9982