Merge "DO NOT MERGE Set Settings.Global.CELL_ON default to CELL_ON_FLAG if not defined. am: 89dd33541f am: 8545602ec8" into nyc-mr2-dev-plus-aosp
am: 8f8e81ccdb  -s ours

Change-Id: I1ea6bcbf7d07dfb5e6884e80fa0ade9afe892386