am 33c05985: am e70748e7: Merge "Remove unnecessary userid check" into jb-mr2-dev
am 33c05985: am e70748e7: Merge "Remove unnecessary userid check" into jb-mr2-dev

* commit '33c05985102ea9a357263bba8e6a3789d20f6ba7':
  Remove unnecessary userid check

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