Merge "Avoid using UserHandle.isSameApp() in package check" into main