Merge "Revert "Update OccupantZone config to match magpie"" into udc-dev am: 4708bf35ad

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/23216009

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