[automerger skipped] Skip ab/6749736 in stage. am: e7452d1677 -s ours am: 1f7021a6e0 -s ours

am skip reason: Change-Id I57ff1a49df2d9f0e145414befd2a5b6236285301 with SHA-1 a060f64025 is in history

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

Change-Id: I2804b48d161f55652d4b8b116eaa00e094f5d87c