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

Change-Id: I03ea504ffa2bb2a91eb631a03d7aa7471fd2fbb8