[automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799f91f5 -s ours

am skip reason: Change-Id Ia45f259338a1f8255e22c7ba6125e8149eaa9081 with SHA-1 936c77642d is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1422399

Change-Id: I7d8055b131b1a51714aca201f347a5e3f36028eb