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

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

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