Fix issue #7318666: hide developer options from user build

Change-Id: I4c5a66bd5f4d3fc36d439228a7a276d694291606
4 files changed