Merge "Avoid NullPointerException in enableSystemApp if the app is absent."