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

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

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