Remove Pixel 4 namespaces from Pixel 5. am: bc9c97afaa am: 146a1f488e am: 21e3dda2d5

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

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