DO NOT MERGE Set Settings.Global.CELL_ON default to CELL_ON_FLAG if not defined.
am: 89dd33541f

Change-Id: I6cf439f8ce0e95dc21ebacdd732760430759646f