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

am skip reason: Change-Id I51411eabdf7f95382b4049a26f261b6d7af9aa86 with SHA-1 40107d2ac0 is in history

Original change: https://android-review.googlesource.com/c/device/google/wahoo/+/1421754

Change-Id: Ief69bcaba4fd9f891e4d681e4ede4c96e2d084fe