Merge "Replace hidden UserHandle.isApp() usage for mainline"