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

Change-Id: I881fac9fd3c0e92c5307d24aefb5c7315492ee76