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

* commit '400521f292cd984b767f81192abda58c54076ea8':
  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