Merge "Do not get device owner admin info when device owner is null" into nyc-dev