[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 8e972379a0 -s ours

am skip reason: skipped by user delphij

Original change: https://android-review.googlesource.com/c/device/google/trout/+/1740178

Change-Id: Iac4375d933438ac54268ca4cca90cda82082773d