Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev

am: ce3f3380

* commit 'ce3f3380':
  Have unified setter/getter for Secure Settings.
  Remove redundant arguments.
  Use Context#getSystemService(Class<T>) in IMMS.
  Use Java7 diamond operator in InputMethodUtils.