[automerger skipped] Merge Android R am: 544c4429fb -s ours

am skip reason: Change-Id I05bf001a541c36cea285a3ee33b0ede8403c271d with SHA-1 412223d76f is in history

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

Change-Id: I8d72d910e0544130517d503400d4b75e8a3e1395