Merge "remove no longer existing shadows" into main am: c217fa6a

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



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