[automerger skipped] Merge Android R am: 08a9364083 -s ours

am skip reason: Change-Id I4d1fe63e23fcf4ed5cd9013e2bdf509bc3722525 with SHA-1 43295278bf is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/interfaces/+/1422433

Change-Id: I4eb4a6649b34bc4c0afc29a2f3fb27a7c24329d3