Merge "Don't use androidx nodeps modules" into main am: 55afce9107 am: e26393c5d2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3013921

Change-Id: Id2fadc6e3eeedfdaf34ceb826a079bdc8c2c12cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>