am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev
am 1e2f3d98: Merge "Fix UserManager#isUserAGoat" into lmp-dev

* commit '1e2f3d98e74c1b0d81fa536a70241bb998d29036':
  Fix UserManager#isUserAGoat

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