Merge "Update state when disabling and enabing develop option" into main am: 0fad6810

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



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