Merge "Updating settings icon in frameworks/base/core"