Merge "Fix updated privileged app with shared UID loses privileged permission when request in manifest." into sc-dev