Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for...
Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev
am: 0114263a
* commit '0114263a':
enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode