Remove Pixel 4 namespaces from Pixel 5. am: bc9c97afaa

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

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