[automerger skipped] Merge "fix container designation, it should be system_ext" into main am: 91d5413375 am: 030ebbf23c -s ours

am skip reason: Merged-In I8ee2fd5fad529da2026af77f969abbf88e636ac3 with SHA-1 a4e178e6dd is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074306

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