Merge "Fix issue #35365651: ActivityManager.getPackageImportance() doesn't..."