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

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

Change-Id: I7674f97ddb0f1467a0faa7e7a89e0c7999e1742a