Merging 8ce3c53fcf into qt-qpr1-dev resulted in a merge conflict due to a method being moved between qt-qpr1-dev and rvc-dev, such that the patch backported from rvc-dev didn't match at all. Removing the old method makes this branch match qt-dev and rvc-dev.
Test: will use abtd to validate the build and the resulting logic.
Original changes: Id82d20c9f1f2001400871b5381f52b40fbdf81c5
Original
Bug: 231322873
Breakage
Bug: 241087006
Change-Id: Ic4f8d701d97aa9b6c72875df8c7eab5fd51934e0
518980587b