Merge "Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev am: 1d03b948 am: c6667aad"