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

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



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