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

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



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