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

am skip reason: Change-Id I33c8b79d82aaaecd05cc1c74f6c6a8613c42fa68 with SHA-1 f9d897c0ce is in history

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

Change-Id: I68e800f6febbf808fc3e3f6117cf3abed5090c30