Merge "Make preferred activities encryption aware." into nyc-dev

am: 8b609f3a96

* commit '8b609f3a96f9576c258ffd38cea2853cd2129ebf':
  Make preferred activities encryption aware.

services/core/java/com/android/server/pm/Settings.java

@@ -3049,7 +3049,7 @@ final class Settings {
             tmpPa.dump(new LogPrinter(Log.DEBUG, TAG), "  ");
         }
         Intent intent = new Intent();
-        int flags = 0;
+        int flags = PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
         intent.setAction(tmpPa.getAction(0));
         for (int i=0; i<tmpPa.countCategories(); i++) {
             String cat = tmpPa.getCategory(i);