Remove Pixel 4 namespaces from Pixel 5. am: bc9c97afaa am: 688276eb79 am: d9e2b199c7

Original change: https://android-review.googlesource.com/c/device/google/redbull/+/2808933

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