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

Change-Id: Ie6d76e78fd8d34b7018b442aa4d8addad79c6616