Merge "Disallow turning off developer options in page-agnostic mode" into main...

Merge "Disallow turning off developer options in page-agnostic mode" into main am: 0d124654 am: 74da70de

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



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