[automerger skipped] Merge "Disable "Developer options" by default for managed profiles." into tm-dev am: 863a3808 am: cde50eaa -s ours am: 6d9e45d2 -s ours

am skip reason: Merged-In Ibe6b721f2552d9e72aba0582a2eed4ba87178c7c with SHA-1 3461e849 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31566754



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