Migrate more System and Secure settings to Global. Bug: 7231252, 7231156 Change-Id: Idad27f4430d7dd188ea228ceac5934fdae5d6920