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

Change-Id: I9ba6a5fde52cc3a63facf062e5c4e76cb52921cf