Merge "Settings: Adapt edge-to-edge enforcement" into main am: 9befb6cd8f

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

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