Merge "Updated relevant aidl to pass current user when setting PhoneAcctSuggSrvc." into main