am b65e480c: am 8b4ab04d: am 052918f1: am a60d59bb: Merge "Add test that device owner cannot be set when account present" into mnc-dev

* commit 'b65e480cc680ef4819a8690e2a3357785997d721':
  Add test that device owner cannot be set when account present