[automerger skipped] Merge "Revert "Add setupwizard_feature_prop as one of properties allowe..."" into 24D1-dev am: 2af9745bc8
-s ours
am skip reason: Merged-In I8c8473f5a9c0cf9c53a95943101976d4b7103580 with SHA-1 33de53de68
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zumapro-sepolicy/+/27828775
Change-Id: I832ac558cc338607af93f062bac9d41daf49c0b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
04cd87f1de