Merge "[pm] consolidate clearPackageStateForUser" into main