am 1eb2e84c: am 9da08122: More on issue #7318666: hide developer options from user build

* commit '1eb2e84c0ebd06529d4a91003d35aed3056e106e':
  More on issue #7318666: hide developer options from user build