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
am: 51296a54
* commit '51296a54':
enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode