Merge "Don't import removed namespaces." into udc-d1-dev am: 30acbec187

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/23524494

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