Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev