Merge "Check for null in getDeviceOwnerOrProfileOwnerPackage" into qt-qpr1-dev
am: 50d6c5a6a8

Change-Id: I4f809b488af422a94d32a97fb328c08287aca50a