Manual merge of ag/2264818 from master

I can't tell if this code ever executes on O, but I don't
want to leave an infinite loop lying around.

Fix infinite loop in LinkAccessibilityHelper

Not that this, this this.

Bug: 38315555
Test: Just build verification.
Change-Id: Ib7e756bfc41a5b1cf17c4685d7846dd72b60d102