[automerger skipped] DO NOT MERGE am: add0bb9579 -s ours am: 8316aadd2f am: 30087e2b0b

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

Change-Id: Icb56fe5d1d4b821ff7281f59c3bd0af06882af26