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

Change-Id: Iea2a68838755eff97cd044e45039a6f98cdbb71f