[automerger skipped] Merge Android R am: 544c4429fb -s ours am: 69f64580a8 -s ours am: 7ef4baca30 -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: Id65e5a635815fb9c1c749514d019c9861ec5a66b