[automerger skipped] Merge "Merge Android R" am: 02dfcc7c15 -s ours

am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436

Change-Id: I1dfdc73c439333e21b5a057c255f40f58361c6ef