Merge "Merge "Do not get device owner admin info when device owner is null"...
Merge "Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459 am: 3c570f9a" into nyc-mr1-dev-plus-aosp
am: d6f9056f
* commit 'd6f9056f':
Change-Id: I440afb7323cc2730d12918fa8e78457832a89038