Revert workaround for ABI imcompatibility dialog

We added a workaround to fix our CTS tests due to a dialog being
shown during the test; since a solution for all tests was added
in ag/23539523, this CL will revert that temporary solution.

Bug: 285142506
Test: atest
Change-Id: Iaa2dc9ecd483e0c0e3c943f929e62a006a8c229c