Updated to stock Settings from aosp master