Remove Pixel 4 namespaces from Pixel 5. am: bc9c97afaa

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

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