Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev