Don't use androidx nodeps modules

The androidx nodeps modules were an internal implementation detail,
they are being removed.  Replace the nodeps dependencies with the
non-nodeps versions.

Bug: 326265727
Test: atest SystemUILintCheckerTest
Flag: NONE
Change-Id: Ia30ea9ffce315cf26f058d50b9b9441506d4d240
2 files changed