am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
am c97332cb: am 31cee479: Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev

* commit 'c97332cb8751356d2fa5ecf8a92cea73d277cadc':
  Fix a runtime restart when cycling between 4 users

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