Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459b7
am: 3c570f9a12

* commit '3c570f9a1261532952f0fc11aefb53b0e558625d':
  Do not get device owner admin info when device owner is null

Change-Id: Iaa58b141c72bb4a419bc40fd8091dd28b239ddbc