am 5638d3a6: Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev
am 5638d3a6: Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev

* commit '5638d3a661f3b4cbda01e23c7b8a0a3eb9f6e107':
  Marking the Settings ContentProvider as singleUser

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base