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

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

Change-Id: I29edf9a63d29c8016ee88f9ebe93d3533c09dbed