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

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

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



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