Merge "Do not get device owner admin info when device owner is null" into...
Merge "Do not get device owner admin info when device owner is null" into nyc-dev am: 21f98459 am: f2ca8f9c
am: a263edf1
* commit 'a263edf1':
Do not get device owner admin info when device owner is null
Change-Id: Ibaad7c727c770fb98a077dff3d80ea0ba0f1e821