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

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

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