Merge "Move getDataServicePackages to after clearCallingIdentity"