am a224e801: am a8a0ac69: Merge "Do not access WindowManagerService#mCurrentUserId w/o lock." into mnc-dev

* commit 'a224e801d690cfb7136b47dade5167b1cc21cd6b':
  Do not access WindowManagerService#mCurrentUserId w/o lock.