Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev