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

* commit '21f98459b7740f57f6fd0415298cb5f5c0c7e0ae':
  Do not get device owner admin info when device owner is null

Change-Id: Iae5d7d5f9e5f5cf23d8c02bf9a4322e4569be9de