Merge "Don't set value when developer options disabled" am: 692f5368d0
am: 5ef8843845

Change-Id: Idb3c130e31571111911b4e17d989b1199ff7619a